From: Raspbian forward pporter <root@raspbian.org>
Date: Thu, 12 Apr 2018 02:25:43 +0000 (+0100)
Subject: Merge version 1.3.1-1+rpi1 and 1.4-2 to produce 1.4-2+rpi1
X-Git-Tag: archive/raspbian/1.4-2+rpi1^0
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=5d9b7c5aad7c4bc4db3f7a4e3f167395e4d49165;p=volk.git

Merge version 1.3.1-1+rpi1 and 1.4-2 to produce 1.4-2+rpi1
---

5d9b7c5aad7c4bc4db3f7a4e3f167395e4d49165
diff --cc debian/changelog
index 8a0da57,87b2e94..4725865
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,15 +1,22 @@@
- volk (1.3.1-1+rpi1) buster-staging; urgency=medium
++volk (1.4-2+rpi1) buster-staging; urgency=medium
 +
 +  [changes brought forward from 1.1-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 20 Sep 2015 20:30:19 +0000]
 +  * Disable neon.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Wed, 04 Apr 2018 01:40:23 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 12 Apr 2018 02:25:43 +0000
++
+ volk (1.4-2) unstable; urgency=medium
+ 
+   * Upload to unstable, needed by gnuradio (>= 3.7.12.0)
+ 
+  -- A. Maitland Bottoms <bottoms@debian.org>  Tue, 03 Apr 2018 01:03:19 -0400
+ 
+ volk (1.4-1) experimental; urgency=medium
+ 
+   * New upstream release
+     upstream changelog http://libvolk.org/release-v14.html
+ 
+  -- A. Maitland Bottoms <bottoms@debian.org>  Tue, 27 Mar 2018 22:57:42 -0400
  
  volk (1.3.1-1) unstable; urgency=medium
  
diff --cc debian/patches/series
index b1b0dff,329797c..25913e8
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,7 -1,4 +1,5 @@@
  native-armv7-build-support
  make-acc-happy
  sort-cmake-glob-lists
- install-all-headers
- sort-input-files
  libm-link
 +disable-neon